cleaned up some names