Fix spacing issues again