Code cleanup
Merge branch 'master' of git@github.com:ST-DDT/CrazySpawner.git