This makes no functional change at all, it just removed trailing white
space and makes the code fit into 80 columns