Formatting

Work to normalize/conform formatting.
Some test data left in existing alignment.