Some cleanup and a small amount of work on game module