Update Data

Massively cleans up data