Another file refactor