Tiny style/efficiency improvements

TBR