extract build_uploader from mount_uploader
prefer guard clause
prefer present to not blank, double-ampersands to 'ands', simplify logic
Merge pull request #1213 from taavo/refactor_mount

refactor mount