Small cleanups 1