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

Minor refactors and updates