Commit 9d9d8fe658b21e57db783cf30f00cf8baa9c9d27

DRC 2017-11-17T18:15:42

Code formatting tweaks