Add logger to more files and small cleanup.