Filling in missing solution
Refactoring
Solving 41