Use curly braces after 'if'
Use more const