Reformat code according new rules