Minor optimisations and clean-ups.
Added a doNotSave option to PropertiesFile