Add empty row func, and clean up