Cleanups after review