cleaned up some messes