Pretty printing

Also had to change the License heading because it looked like conflict markup