fixes with whitespace, remove untokenize