Code cleanup

-Better print function