Updates to the logging to be more clear