style + refactor