Did some major code clean-up with Eva's syntax formatting classes.
Merge pull request #120 from Cazra/master

Eva syntax formatting cleanup