Work on a cleaner type/expression system