continued work on cleaner portal