Merge pull request #19 from Webiny/master

Minor code refactor