Cleaned up some mess