Fixed return check and removed some logging
Better tokenizer