couple cleanups