Minor cosmetic code touch-ups. Changed some comments and whitespace.