Indentation fix
Logging messages make more sense
More comments