Address @jasongrout 's review comments