Minor fix and reformat etc