Cleanup, and reorganizing