format and padding fix