removed debugging.  Minor refactor.