cleaned comments/logging