Extra char
Some refactoring to move common things up to DownloadHandler