Restructure print statements