cleanup names and stuff