mostly more reformatting