stylistic consistency and misc changes