Code cleanup
Refactor DownloadHandlerFactory