Refactor Labyrinth methods