strict mode safety and syntax modernization