code cleanup matching strict mode