Finished refactoring round.