refactor styles, etc