Formatting updates, re-ran tests.