Moved comments a bit and made sure they are under 80 chars.