removed comments, updated some better names
Merge branch 'master' of github.com:banane/bananealarm