This commit also removes some trailing whitespace.