Cleaned up downloads a bit