fixed formattings