Too many OK, so's, reformatting