Some reformatting and test cleanup