Some refactorings of JavaFileModel