Refactor conditionals

Tell and do not ask