MOre work on the code formatter