Cleaning up conditionals