Update style and replace some defs with vals following review by sjrd