an small cleanup