minor cleanup
move strict mode up
remove debug lines