Comment refactor

Clean up the code a little and fixes #51