Merge pull request #65 from learn-more/master

Cleanup & refactor