some style changes

Commit with the style changes to avoid polluting a commit that
should be about something else.