Style. Reflow some lines to comply with PEP8
Fix a variable name mistake
Remove an old hook to a function that was removed
Fix a poorly writen comment