Refactor property logging

No match.