More formatting and cleanup.