cleanup, moving things into filetypes