Tidy up/jshint