Refactor entry point & make elapsed time more accurate for reporters.