formatting, remove debug code