Image#upload! working and refactored