Modernize and Normalize