Refactoring round.