changed logging to be consistent