Small rearrangment for uploader