whitespace changes to reflect new coding style