used saner names + removed some cruft