Printing out the proper p-value, and cleanup

Contributes to #160