Removed debug prints
Polished things up a bit