code cleanup and rationalization, 100% coverage