Cleaned up whitespace and line length for ticket #20398