Reformatted and other tweaks.