Small improvements in the code formatter