Minor neatening-up. Make assignments in same order a struct fields. Line-up comments.