Fixed formatting in various places.
 #123