Refactoring the problem statement for week6