Refactor FileType