code cleanup for movementstyles