Fix Spacing Issues