Indentation fixes and other improvements.