Mostly formatting updates

…and removing the test button.