reformatted layout and brackets, etc..