more spacing cleanup