Final finishes on refactor