Initial solution added
Initial solution and refactored solution added