Refactor send