Refactor: Simpler motions calculations
Refactor: Map over recursion
Refactor: Further simplification and reformating