Cleaned up the formatting for problem 4
Merge branch 'tidy4', which cleans up the formatting of problem 4 to be
more compact.