Updated TODO and refactored variable parser