Format updates

Current changes from code walk with Ed.