Fix formatting inconsistencies