code cleanup
syntax highlighting
Merge pull request #2 from kolive/master

Syntax highlighting and magic number refactors