- Style and commenting updates.