Fix & reformat