WIP - Maze game refactoring