Refactor properties.