change macros to functions
add split methods to tokenizer
spme method renamed