Some random cleanups