File refactoring for clarity