Change comments and add notes
Refactor callback data references