Some comments and restructuring.