Cleanup and add download path option