Cleanup some more comments