refactor: us and them