Whitespace updates for readability; Delete trailing spaces;