Refactoring property grid