Fix/reformat code