Add modernizer and normalize