Refactor sender app