Reformatting and clean-up.
Reformatted.
Reformatted.