Fix spacing issues slightly