Removed unnecessary comments and commented out code.
Moved function into anonymous namespace and rename.
Merge pull request #44 from murrekatt/main_cleanup

Removed unnecessary comments and commented out code.