Cleanup and consolidation
Cleanup and consolidation