Formatting Changes

Conforming to coding conventions now, are we?