cleanup + add filetype info