Address some comments brought up by @miketheman. Thanks!