Clean Up

Cleaned up the printing a bit.
Fix conflict