Game Class - Code Cleanup