Remove unnesessary blank
Use if/else, avoiding multi lines
Shorten const name