Cleaning Up Code

Cleaning up the print work and verifying math.