cleanup and adding more data