Refactor spacing
Fix client