cleaning up conditionals