Clean
Implement activity and tested