Tim-346: Addressing PR feedback