Address code comments