Minor fix and formatting tweaks