small-cleanups

small-cleanups