[issue-311] Improve spacing