1st pass of 2nd GenART review

Signed-off-by: Tom Haynes <loghyr@primarydata.com>