Cleanup problem 16
Problems 17, 18, 19