Cleaning up separation of data, from display.