ohskel-list speedup. random code cleanup