Change formatting & fix some jshint warnings