Greatly simplify, standardize a little