#28, made some minor changes to clean out a bunch of StyleCop warnings.