Refactoring of file