Minor fix and formating