on my way to a cleaner plugin