Exercise-ifying the code 2.