Tidy up table config and using conventions
Improve primary and foreign key selection