Refactor Sender

Fixes #19