Cleaned up more data