cleaning up andrefactoring to make the bug perhaps plop out