- few minor optimizations.