Minor refactors and updates
Merge pull request #5 from Webiny/master

Minor refactors and updates