Commit e621dfc508e8093852f2294b7e421116ffed1d77

DRC 2016-02-19T10:35:09

More minor code formatting tweaks