Formatting and jshint cleanup