style improve- and refinements