Remove debugging code
Change whitespace