FLUID-5284: removed jshint ignore statements

Some slight refactoring as well as using other features of jshint to remove a couple of jshint ignore lines