Problem006
Refactor problems
Problem007