fix indentation.
consolidate name.