Another refactor finished