improve the flow of text and cleanup