Rewrote strvar string tokeniser logic, refactored code to use strvar