More cleanup

tokenize_error: because why have two lines when you can have one?
removed some unnecessary blocks afterward