cleanup property lookup, as per dkubb's suggestion
cleanup property lookup, as per dkubb's suggestion

merbjedi/dm-more-hacked,bterlson/dm-more,cachafla/dm-more,merbjedi/dm-more-hacked,mattetti/dm-more,mattetti/dm-more,bterlson/dm-more