housecleaning: removed clutter, added DEBUG macro