remove comments and unnecessary brackets around single line else statement