rm upload; fix formatter