Refactored how properties are constantized