cleanup
code formatting
added callback provider