- Implemented manual cleaning - Refactored the code Change-Id: I301aaf9dfd6aff90f505148b65e75033f5043553