cleaning up and adding data listing