Week2 Lab2 Done but need to refactor to submit