Finished problem 7

Source + comment cleanup