Refactor get