cleaned up some codes
Merge branch 'master' of github.com:ryanatk/squirt-gun
Merge branch 'master' of github.com:ryanatk/squirt-gun