Refactored properties to be more stringy.

Refactored properties to be more stringy.