refactored reader function for consistent token matching 2h#14

cdsiats wants to merge 3 commits intostackpress:mainstackpress/idea:mainfrom

cdsiats:maincdsiats/idea:mainCopy head branch name to clipboard