- prefer preincrement
- always use {} with if statements
- replaced a #define with a const
- fixed some incorrect indentation
- remove some extraneous semicolons and parentheses
- removed dead tests
- improved comments
- added some consts