Matt [NA] a bit of code cleanup