Fixing the logger to be even cleaner