Minor tweaks
Removed debugging printing