Code cleanup and indentation fixes.