cleanup names and fix some warnings