Address @jasongrout 's review comments, take 2