Standardization and cleanup