re-write comments