Made comments more exact, formatted code to strict 80 columns