Cleanup various comments