Moved things around
Cleanup