Trying to unpick license upload - code tidy