Fixed MovementHelper rendering

+ small file refactor