More refactoring, clean up, to make use of cleaner way of obtaining property wrapper name