Remove leftover stuff from trial run, fix hyphenize method