some names
some cleanup