adding to do and cleaning comments