More refactorings to the File Sender