Tiny refactoring of Motion class