Minor improvements on task 2.