Adding macrobenchmark measuring time, refactoring.