Reformat code to make it greener