Some cleaning up
Updated the table structure to match my current setup