Minor tweaks, remove debug code, comments