improved if/elif/else statement for Clauses

Improved if/elif/else statement for Clauses