Code cleanup and indentation.