Image Upload & Refactoring