mostly reformatting