normalization, cleanup