simple refactor of motion manager setup