Cleanup
Fixed rotate