More reformatting and cleanup.