Making the logging better