Addressing review comments by @adriancole