clean up and add some list