Remove copy/paste mess
Add support for .txt as raw format