Cleanup and added more filetypes