First pass at cleaning up the mappings
There's still loads to do in here, just tidying the table and lists for now