Final updates to formatting and header comments