cleaner panel refactored