Mini-refactor properties