fixing some code smells, refactoring
Merge branch 'master' of https://github.com/jjromeo/Massive-Theatre