Cleanup: comments