#138 #72 code review
Merge pull request #231 from flower-platform/GH138-refactor-properties-and-default-values-review

#138 #72 code review