Did some cosmetic style-related changes; otherwise is ok.