Address some of @davidhelms's feedback