remove trailing commas, and adjusted indentation which was causing jshint errors