More clean-up and now store database data in multiple tables