Reformat and add Logger