Made changes per Abi's code review