Style tweaks

Last push before "release".