Refactoring
Included correct solution for 21
Starting 22