Cleaned the Code

Bundled the separate rotation code.