Cleaned up some of the rotation