Small refactors
Merge branch 'master' of github.com:sendwithus/flipzies