Cleanup code comments