fixed file refactoring