Format codes, and through the smoke testing

Format codes, and through the smoke testing