merged style_refactor