Cleanup of text files
Refactoring