Indentation fixes that were not apparent in Eclipse