Some format changes