More stickman refactoring