Cosmetic code cleanup, improved some comments.