Smal cleanups