Update some comments
Cleanup