Committing on 25th Sep 2014.

Formatting changes.