Time-profiler is working, structure simplified.