Address comments by @lightsofapollo