Some cleanup in comment