Remove debug log statements, clean up whitespace