small cleanup / slightly faster movement