Fix #15
Decrease indentation by remove an else statement