more comments, less logging