standardization and cleanup