Made some cleanups