cleanup how the property file is set