cleaunp and adjust comments