Trying to get rid of print calls