Address @anthonycabot comments