cleaning up GameMaster.cpp