Stylistic cleanup + call cb at the very end