Tested Tasks 6 and 7

and some minor formatting changes to make the assignment easier to understand/run