suggestion : put the refactoring of the if-then-else in a seperate commit.