Improve spacing