Reformat to match style