Updates as per feedback on PR