File refactored