cleanup some comments etc