A lot of refactoring for recent files