Code style: new tools methods aligned to the new code style.