refactor some more
rather massive refactor/rename