some clenupp
fixed style
smart order
Merge branch 'master' of github.com:everymote/partymote