Code cleanup. Motion is now normalized as motion-per-frame instead of motion-per-second