improve usability and jshint cleanup