Cleaned up a little bit tiny bit partially.