Removing if Statements