Moved more output to logging