Fix some aesthetic issues

...discovered after looking at the code with fresh eyes.