cosmetic spacing cleanups (decided to lose all spaces in a templated name)