Clean up of code comments