cleaned up the movement class