Remove obsolete code from job callback
Fix code and comment style issues