Improvement of code formatter