Problem 17 - fixed an error and cleaned up some lines.