Refactoring properties



<!---
@huboard:{"order":4.0,"custom_state":""}
-->