Addressed review comments r/3348