Cleaning

- Added cleaning method
- Need to be improved