Remove debug output; cosmetics