Changes based on a code review

Changes in importers and logs analysis.