remove tabs and fix names