package and jshint cleanup