Bit of clean up in the UserMovement class

consolidated the methods a bit