Addressing minor issues raised during review