Improves spacing handling