Small tweaks to make it more presentable