refactor conditionals to more descriptive methods