Changes to pass jshint validation