Few cleanups