more code reformatting