reformatting to fit coding styles