refactorings.  One rename and one type refactor.  Some cleanup.