removed commented out code & one pass w jshint