Refactor properties