A couple of coding syle updates to follow the re-indent.