Code: Cleanup and formatting

Formatted using [BatchFormat extension](http://visualstudiogallery.msdn.microsoft.com/a7f75c34-82b4-4357-9c66-c18e32b9393e).