Refactor AverageFinish activity