refactoring and empty files and chat