Updates to pass jshint validation