Restructured a little