Fixing Spacing issues