Refactor and fix up properties