Minor code formatting tweaks