Refactored some code
Added default value to game environment