small changes to formatting and logging