Re-apply normalization

Thank you for taking the feedback into account @cruncher-abde