Refactor sender