cleaned project pt.2