Cleaning up data tables and using helpers to minimize code