Addressed comments from previous PR