Addressing further @ebidel review comments