fix cleaner to return boolean with toBoolean