refactor to style