kill some of the ugly and improve performance