Trivial cleanups