Cleaned up some ugly.