Refactoring.
Normalized property dump.