clean up some ugliness