Removed extra stuff from print code