Move more logic from addMountPoint into separate functions

I *will* get Scrutinizer to give something higher than an F for addMountPoint... also this reduces duplicated code and (IMO) makes the logic a bit clearer