Minor update to headers and declaration order.