Simplify IF Statements (leave logic the same)