performed suggested cleanup and fix 2 failing tests?? don't know how they were missed??