refactor II