improve uploader
simplify upload