Minor edits to remove output to console for standard logging