refactor, styles