code cleanup, prepping for more Go style game