propertyloader refactoring