cleanup, renamed decorator