Cleanup and reorganization
More cleanup