Tidy and improve spacing