Clean up Project
clean up
Add test
Modify update
Modify remove