Cleaned up some assertions