Refactor continued.