Clean-up and adding rotation component