more spacing and sprintf cleanups