Do not put comments between the if body and 'else'
Clean up comments inside expressions