Some refactoring.
Lots of property filters.