cleaning up some sloppiness