This commit: - Optimizes usage of std::unordered map - Corrects variables naming and output messages - Minor changes in using std::string methods Signed-off-by: Kacper Nowak <kacper.nowak@intel.com>