cleanup and browser strict mode fix