more style issues

Merge or reject at your convenience.