JJP: mostly reformatting