Remove print statements and start adding proper logging