A little bit of cleanup after some experimentation