Minor refactorings.

Changed Dictionary to IDictionary.
Changed various capitalizations.
Changed where curly braces are used.