more cleanups
indent cleanups