further code jshint tidy ups