Fixing comments/logs