Update to address GitHub comments