Updated logging to be more usable