Linebreaks cleanup
Use lowercase constant
Various coding style improvements
Better formatting of if statements
Wrap some long lines