Minor mods, code formatting.