Make updates based on feedback from @robhudson