Some dependency properties refactoring