cleanup comments etc