Adjusted comments around if-statements.
Fix for main function signature.
Moved out helper class into anonymous namespace.
Changed to use nullptr.
Clarified endifs.
Merge pull request #47 from murrekatt/main_cleanup

Even more main cleanup