General cleanup, limit to 80 character lines, use code blocks