Refactored file