Overall statistics introduced
Redundant code removed