Refactor property definitions and initializations
Merge pull request #258 from Erol/refactor-property-definitions

Refactor property definitions