Cleanups, small redos