Clean Up Tables Make into generic examples