Working out cleaning up trailing whitespace.