cleaned comments and log output