Add rotater format and remove some padding