Improve some formattings