cleanups; fix indentations.