Modifications to pass jshint validation