General updates and format cleanups