Small tweaks to format it better