Tidy up. Boilerplate callbacks, removal of junk
PEP8 changes
Remove debug line