Improving spec and moving functions
Improving Problem 12
Moving Problem 21
Moving Problem 25