misc format changes