Modernize syntax