Clean up whitespace and tabs (#2617)