Refactored properties to be more stringy.