Addresses minor pr feedback