Convert to strict mode and new formatting