modified logic of tokenizers so that it only contains one return statement
modified logic of tokenizers so that it only contains one return statement; enhanced logging in case of error