Update comments section
Cleanup general