Very large dish decorator refactor