add/cleanup comments