Modernize Code