Normalization and cleanup ++