Format code
Rename Finisher to CallbackHandler