Improved if-clauses