Make kibit-suggested changes