cleaned up some sloppiness