Few small cleanups