Fix indentation.
Some explicit returns. Fix some cb -> next mistakes.