Fix ElapsedTimer;
Small refactoring.
Updated.