some cleanup. ordering of old comments can't be fixed