Adjust whitespace on previous patch to make it slightly easier to read
Update :upload-location to be optional