Small improvements in task 2_5