remove nested logic, improve validation where possible
Activity