style
refactorings
move strtok extensions to common