Refactoring enum, property declaration, direct property access