Clean up exercise 3-2 function signatures