OP-1404 Fix NMEA data parsing for GSV
OP-1404 - minor cleanup, removed some duplicated code