Refactored character object & game layer