Addressing @adamrp comments