Unify some property getting logic & potentially reduce memory usage