Indentation fixes and code cleanup.