Minor code format corrections - part 2