Cleanup from code review
Merge pull request #63 from alxdarksage/cleanup

Cleanup from code review