cleaned up code and made global game object
cleaning up code
fixing merge issue