Second pass of review from ScottMitch