Move Conditional Normalization to Method