Code review changes for formatting and attempted bug squashing.