Formatting and jshint updates