Refactor of property init