Moved variable parser to separate class