Allow spaces in 'disablesites'
Minor refactoring