Refactor continues