styling refactor