clean up parsing some more
clean up parsing some more

meejah/txtorcon,david415/txtorcon,isislovecruft/txtorcon,sammyshj/txtorcon,isislovecruft/txtorcon,ghtdak/txtorcon,meejah/txtorcon,david415/txtorcon,ghtdak/txtorcon,sammyshj/txtorcon