Trival tidy up of trailing whitespace and commenting.