Moved label and type parsing to raw data function
Removed whitespace
Moved function and data objects to raw data function
Renamed retval to rv