Some trivial clean-ups

Some trivial clean-ups