Refactoring: tokenizer renamed to cinderella