Match tab size, reformat code