Fix formatting and nomenclature