Minor:

- cleanup and convert
Because I'm still learning and I thought it would be the cleanest way to add them.
Your suggestion is to remove the tables?