Benchmark computations, refactor and add problem 25