Made some finalizations