clean up and add requirements