Formatting and whitespace tweaks