some code reformatting