Fix some style choices causing JSHint warnings