Cleaning up add cols etc