A nicer way to clean this data
Refactor everything so it works