clean up the notation a little
eqnarray -> align in a lot of places