minor refactoring in properties