Small re-factors
Merge branch 'master' of https://github.com/billyauhk/cloudless