- more format changes and code cleanup, along with some restructuring.