Minor improvements on task 4.