further tidy of maze class after refactoring