Fixed more spacing issues