File refactoring cleanup