Quick improvement and further test cases for if