Wrap lines to 80 chars and improve some comments