Improve output
Reduce clean line width
Bug fix: improve output