cleaned up some mess