more code reformatting, again