Begin formatting cleanup and documentation