Refactored some properties.