refactored file
refactored solution