Clean up some sloppiness