Problem 22
Clean up a bit
Problem 23