more reformatting of source code per guidelines