keyword code refactor
propertyloader refactor