Organize conditionals in a better order