Cleanup of some comments