style refactor