cleaned up some uglyness