fix(image upload): fix image upload, minor clean-up.