Cleanup a little
Modify rotation behavior