removed junit stuff, better names