Minor format changes

Please pull these changes from my fork.