Improve some spacing