Entering an empty string as a mountpoint removes it
Minor fixes and refactoring