Minor adjustments
Remove debug prints