Update Addressed Issues per @mjwitte review.