A few more whitespace tweaks