formalized result set mapping and cleaned up propertyReader