re #959: removed some debugs and indentation