Some code cleanup

Bit of experimentation with the core motion