Fix up whitespace issues causes CI tests to fail the lint check.