Fix spacing issues