Cleanup and addition of offset system to parser methods