cleaned up a bit after enabling JSLint