indent fix, minor cleanups