Changes to data parser

Began to streamline the parsing, so fewer jumps will be made in the
large for-loop.