Whitespace clean-up. Minor Syntax fixes.