Update comments
Cleanup