Cleanup, better (?) things, optimization, more waves
Merge branch 'master' of https://github.com/SmilyOrg/CodenameSnowman