Amendments after feedback from purplefox

Signed-off-by: Dean Pehrsson-Chapman <dean@p14n.com>