Some small format changes