Cleaning up task 4_5