some style unifications, refs #209