Address code review from #59