Add debug prints
Get rid of an if statement