Cleaned up image upload process