refactor2