Change formatting, so that jshint passes (almost)