Tools::normalizeWhitespaces added