Code cleanup
Problem 25
Problem 21