starting cleanup work
more cleanup/rename work