Polished syntax. Minor fixes.