code cleanup and plurals in import log entries

closes #698