Cleanup of variable naming and consts.
Merge pull request #48 from murrekatt/main_cleanup

Cleanup of variable naming and consts.